I don't know why all the stuff from the merge ended up in this PR or how to get rid of it...

I had to squash this into a single commit to fix the issue with the merge commit being included. Sorry about that!

It looks like the "(api)/integration_test/src" directories are missing all the *_framework files. Internally they're symlinks, but it looks like they didn't get included in this PR in any form.

Edit: Looks like other symlinks are missing as well, such as download_googletest.py.

It looks like the "(api)/integration_test/src" directories are missing all the *_framework files. Internally they're symlinks, but it looks like they didn't get included in this PR in any form.

Edit: Looks like other symlinks are missing as well, such as download_googletest.py.

download_googletest.py and the symlinks in src are populated by the setup_integration_tests.py script, which is run by the build process in each mode of building (Podfile, build.gradle, and cmake file) before downloading googletest.

Mainly Copyright police. Some of my copyright comments have ?s -- while the AndroidManifest.xml should have copyrights (if we're following the other google open source projects) I wasn't sure if the strings.xml and main.xml should. I would think so...

No harm in adding copyright to as many files as possible - I added it to all xml, bat, gradlew, and build.gradle files.

Added copyrights and fixed the Info.plist files, PTAL.

It looks like the "(api)/integration_test/src" directories are missing all the *_framework files. Internally they're symlinks, but it looks like they didn't get included in this PR in any form.
Edit: Looks like other symlinks are missing as well, such as download_googletest.py.

download_googletest.py and the symlinks in src are populated by the setup_integration_tests.py script, which is run by the build process in each mode of building (Podfile, build.gradle, and cmake file) before downloading googletest.

Ah, I see why it's not running for me - the testapp builder copies the integration test project to another directory to work clean. The location of the setup script is determined relative to the cmake file in the test project, and only tries to run if found. Could be fixed by looking relative to the SDK/repo directory instead, but I'm not sure how easy it is to get a reference to that in each build file (e.g. from the pod file).

It's not difficult to work around if this is intended behaviour, though - I could change the testapp builder to copy the whole repo instead of just the integration test project, as it's not very large (~50mb).

It looks like the "(api)/integration_test/src" directories are missing all the *_framework files. Internally they're symlinks, but it looks like they didn't get included in this PR in any form.
Edit: Looks like other symlinks are missing as well, such as download_googletest.py.

download_googletest.py and the symlinks in src are populated by the setup_integration_tests.py script, which is run by the build process in each mode of building (Podfile, build.gradle, and cmake file) before downloading googletest.

Ah, I see why it's not running for me - the testapp builder copies the integration test project to another directory to work clean. The location of the setup script is determined relative to the cmake file in the test project, and only tries to run if found. Could be fixed by looking relative to the SDK/repo directory instead, but I'm not sure how easy it is to get a reference to that in each build file (e.g. from the pod file).

It's not difficult to work around if this is intended behaviour, though - I could change the testapp builder to copy the whole repo instead of just the integration test project, as it's not very large (~50mb).

It's intended - I think the best way to do it might be to run the setup script, and then copy the integration tests to a working directory.

(Also that would only be necessary when running the integration tests against a binary SDK. You can run the integration tests against the source SDK directly inside the repo.)

@a-maurice @vimanyu @DellaBitta ping?